apex-ruby 1.0.31 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bae37f85a39a9fdbc9d8c146cc6cfaacc99442e286ff03a3acb19161bfe81b8
-  data.tar.gz: 7892124de93b9f9bf4d1f043fe8bd4d2329267cd5160cf6a96f747a7a673b38b
+  metadata.gz: 7293b4955edf88c3f7e4c94d8b53daf6e951100a954732ed6d4ec39d42e8c27d
+  data.tar.gz: 8e8c7770701a66d0ce072f9f19f4fe8e02a8d3b46d7a53d0837cee391089ec5b
 SHA512:
-  metadata.gz: 5305e310038cad306c81b9426b0c2fdf862a5d562c0a7b2e4d8892d380153f6fafd5f2462833ab5a0351380bcc686326a65768a242ab9b3e557a57275cd99d2e
-  data.tar.gz: 182de5280787b96a01e1877397810d5d039ee71816c91a25a799ab62cc7e43734ecd26e2eff3b0cc6e8d0447a4ea7c56198042dce2c4565978b8cadb643dc82b
+  metadata.gz: eddc7cc1d61ff37d0e817c5329ca446a9d7b509c312ad6c74207bcde526e58c7896df3570d4ce395989782bf72a85ed103172b787e8b6296f583569639b4645a
+  data.tar.gz: 44e77a363487d9b97fafb8b98916d1879e6208c308e7585a368053002c81a829bfa11ecb005c25c55c8cfb4f2d6574444eea54eb01676014bde032c2679a3385

data/ext/apex_ext/apex_src/include/apex/apex.h

@@ -21,8 +21,8 @@ typedef struct cmark_node cmark_node;
 
 #define APEX_VERSION_MAJOR 1
 #define APEX_VERSION_MINOR 1
-#define APEX_VERSION_PATCH 32
-#define APEX_VERSION_STRING "1.1.32"
+#define APEX_VERSION_PATCH 35
+#define APEX_VERSION_STRING "1.1.35"
 
 /**
  * Processor compatibility modes

data/ext/apex_ext/apex_src/src/apex.c

@@ -807,8 +807,8 @@ static char *apex_preprocess_autolinks(const char *text, const apex_options *opt
 
             /* Then: check for reference link definitions: [id]: URL */
             line_start = r;
-            /* Skip leading whitespace */
-            while (*line_start == ' ' || *line_start == '\t') {
+            /* Skip leading whitespace and blockquote markers */
+            while (*line_start == ' ' || *line_start == '\t' || *line_start == '>') {
                 line_start++;
             }
             /* Check for [id]: pattern */

data/ext/apex_ext/apex_src/src/extensions/ial.c

@@ -2781,6 +2781,130 @@ static bool looks_like_attr_key_equals(const char *p, const char *end) {
     return (p > key_start && p < end && *p == '=');
 }
 
+static const char *ial_next_line(const char *p) {
+    while (*p && *p != '\n' && *p != '\r') p++;
+    if (*p == '\r' && p[1] == '\n') return p + 2;
+    return *p ? p + 1 : p;
+}
+
+/* Length of a ``` or ~~~ fence run opening the line (after indentation and
+ * blockquote markers), or 0 if the line is not a fence. */
+static size_t ial_fence_run(const char *line, char *fence_char, const char **after_run) {
+    const char *p = line;
+    while (*p == ' ' || *p == '\t' || *p == '>') p++;
+    if (*p != '`' && *p != '~') return 0;
+    char c = *p;
+    const char *run = p;
+    while (*p == c) p++;
+    if (p - run < 3) return 0;
+    *fence_char = c;
+    *after_run = p;
+    return (size_t)(p - run);
+}
+
+/**
+ * Number of bytes at pos that are code (a closed fenced block starting at
+ * this line, a code span, or an unmatched backtick run) and must be copied
+ * through untouched. Returns 0 when pos does not start code.
+ */
+static size_t ial_code_region_len(const char *base, const char *pos) {
+    bool line_start = (pos == base || pos[-1] == '\n' || pos[-1] == '\r');
+    if (line_start) {
+        char fence_char;
+        const char *after;
+        size_t open_len = ial_fence_run(pos, &fence_char, &after);
+        if (open_len) {
+            bool valid = true;
+            if (fence_char == '`') {
+                for (const char *q = after; *q && *q != '\n' && *q != '\r'; q++) {
+                    if (*q == '`') { valid = false; break; }
+                }
+            }
+            if (valid) {
+                const char *line = ial_next_line(pos);
+                while (*line) {
+                    char close_char;
+                    const char *close_after;
+                    size_t close_len = ial_fence_run(line, &close_char, &close_after);
+                    if (close_len >= open_len && close_char == fence_char) {
+                        while (*close_after == ' ' || *close_after == '\t') close_after++;
+                        if (!*close_after || *close_after == '\n' || *close_after == '\r') {
+                            return (size_t)(ial_next_line(line) - pos);
+                        }
+                    }
+                    line = ial_next_line(line);
+                }
+                /* Unclosed fence: protect only the opening line */
+                return (size_t)(ial_next_line(pos) - pos);
+            }
+        }
+    }
+
+    if (*pos != '`') return 0;
+
+    size_t backslashes = 0;
+    for (const char *b = pos; b > base && b[-1] == '\\'; b--) backslashes++;
+    if (backslashes % 2) return 1;
+
+    const char *p = pos;
+    while (*p == '`') p++;
+    size_t open_len = (size_t)(p - pos);
+
+    /* Code spans may wrap lines but end at a blank line */
+    while (*p) {
+        if (*p == '\n' || *p == '\r') {
+            const char *next = ial_next_line(p);
+            const char *q = next;
+            while (*q == ' ' || *q == '\t' || *q == '>') q++;
+            if (!*q || *q == '\n' || *q == '\r') break;
+            p = next;
+            continue;
+        }
+        if (*p == '`') {
+            const char *run = p;
+            while (*p == '`') p++;
+            if ((size_t)(p - run) == open_len) return (size_t)(p - pos);
+            continue;
+        }
+        p++;
+    }
+    return open_len;
+}
+
+/* A reference definition label must open its line, after at most three
+ * spaces of indentation (blockquote markers allowed). */
+static bool ial_at_definition_start(const char *base, const char *pos) {
+    const char *p = pos;
+    for (;;) {
+        int spaces = 0;
+        while (p > base && p[-1] == ' ') {
+            p--;
+            spaces++;
+        }
+        if (spaces > 3) return false;
+        if (p == base || p[-1] == '\n' || p[-1] == '\r') return true;
+        if (p[-1] != '>') return false;
+        p--;
+    }
+}
+
+static bool ial_append_verbatim(char **buf, char **write, size_t *remaining,
+                                const char *src, size_t len) {
+    if (len >= *remaining) {
+        size_t written = (size_t)(*write - *buf);
+        size_t new_cap = (written + len + 1) * 2;
+        char *grown = realloc(*buf, new_cap);
+        if (!grown) return false;
+        *buf = grown;
+        *write = grown + written;
+        *remaining = new_cap - written - 1;
+    }
+    memcpy(*write, src, len);
+    *write += len;
+    *remaining -= len;
+    return true;
+}
+
 /**
  * Preprocess markdown to extract image attributes and URL-encode all link URLs
  */
@@ -2826,6 +2950,17 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
     int image_index = 0;
 
     while (*read) {
+        size_t code_len = ial_code_region_len(text, read);
+        if (code_len) {
+            if (!ial_append_verbatim(&output, &write, &remaining, read, code_len)) {
+                free(output);
+                apex_free_image_attributes(local_img_attrs);
+                return NULL;
+            }
+            read += code_len;
+            continue;
+        }
+
         /* Look for inline images: ![alt](url attributes) */
         if (*read == '!' && read[1] == '[') {
             const char *img_start = read;
@@ -3244,7 +3379,7 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
 
         /* Look for reference-style link definitions: [ref]: url attributes */
         /* Process to URL-encode URLs and extract image attributes if present */
-        if (*read == '[') {
+        if (*read == '[' && ial_at_definition_start(text, read)) {
             const char *ref_start = read;
             const char *ref_end = strchr(ref_start, ']');
             if (ref_end && ref_end[1] == ':' && (ref_end[2] == ' ' || ref_end[2] == '\t')) {
@@ -4111,6 +4246,18 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
             bool made_expansions = false;
 
             while (*read2) {
+                size_t code_len2 = ial_code_region_len(output, read2);
+                if (code_len2) {
+                    if (!ial_append_verbatim(&expanded_output, &write2, &remaining2, read2, code_len2)) {
+                        free(expanded_output);
+                        free(output);
+                        apex_free_image_attributes(local_img_attrs);
+                        return NULL;
+                    }
+                    read2 += code_len2;
+                    continue;
+                }
+
                 /* Look for full, collapsed, and shortcut reference images. */
                 if (*read2 == '!' && read2[1] == '[') {
                     const char *img_start = read2;
@@ -4311,6 +4458,17 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
                     size_t proc_remaining = strlen(output) * 2;
 
                     while (*proc_read) {
+                        size_t code_len3 = ial_code_region_len(output, proc_read);
+                        if (code_len3) {
+                            if (!ial_append_verbatim(&proc_output, &proc_write, &proc_remaining, proc_read, code_len3)) {
+                                free(proc_output);
+                                proc_output = NULL;
+                                break;
+                            }
+                            proc_read += code_len3;
+                            continue;
+                        }
+
                         /* Look for inline images that were just expanded */
                         if (*proc_read == '!' && proc_read[1] == '[') {
                             const char *img_start = proc_read;
@@ -4446,9 +4604,11 @@ char *apex_preprocess_image_attributes(const char *text, image_attr_entry **img_
                         }
                     }
 
-                    *proc_write = '\0';
-                    free(output);
-                    output = proc_output;
+                    if (proc_output) {
+                        *proc_write = '\0';
+                        free(output);
+                        output = proc_output;
+                    }
                 }
             }
         }

data/ext/apex_ext/apex_src/vendor/cmark-gfm/extensions/table.c

@@ -158,6 +158,13 @@ static void replace_escaped_ltlt(cmark_mem *mem, cmark_strbuf *buf) {
   bufsize_t len = buf->size;
   unsigned char *ptr = buf->ptr;
   cmark_strbuf out;
+
+  /* Too short to hold \<<. Returning early also matters for empty cells: the
+     loop would write nothing, leaving `out` allocated but never NUL-terminated,
+     and callers read the cell buffer as a C string. */
+  if (len < 3)
+    return;
+
   cmark_strbuf_init(mem, &out, len + 1);
 
   for (r = 0; r < len;) {

data/ext/apex_ext/apex_src/vendor/cmark-gfm/src/config.h

@@ -0,0 +1,38 @@
+#ifndef CMARK_CONFIG_H
+#define CMARK_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define HAVE_STDBOOL_H 1
+
+#ifdef HAVE_STDBOOL_H
+  #include <stdbool.h>
+#elif !defined(__cplusplus)
+  typedef char bool;
+#endif
+
+#define HAVE___BUILTIN_EXPECT 1
+
+#define HAVE___ATTRIBUTE__ 1
+
+#ifdef HAVE___ATTRIBUTE__
+  #define CMARK_ATTRIBUTE(list) __attribute__ (list)
+#else
+  #define CMARK_ATTRIBUTE(list)
+#endif
+
+#ifndef CMARK_INLINE
+  #if defined(_MSC_VER) && !defined(__cplusplus)
+    #define CMARK_INLINE __inline
+  #else
+    #define CMARK_INLINE inline
+  #endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/lib/apex/version.rb

@@ -6,7 +6,7 @@ module Apex
   # via Apex::Native.version.
   module Version
     # Current gem version.
-    VERSION = "1.0.31"
+    VERSION = "1.0.33"
   end
 
   # Shortcut to gem version string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apex-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.33
 platform: ruby
 authors:
 - Brett Terpstra
@@ -159,6 +159,7 @@ files:
 - ext/apex_ext/apex_src/vendor/cmark-gfm/src/cmark_ctype.c
 - ext/apex_ext/apex_src/vendor/cmark-gfm/src/cmark_ctype.h
 - ext/apex_ext/apex_src/vendor/cmark-gfm/src/commonmark.c
+- ext/apex_ext/apex_src/vendor/cmark-gfm/src/config.h
 - ext/apex_ext/apex_src/vendor/cmark-gfm/src/entities.inc
 - ext/apex_ext/apex_src/vendor/cmark-gfm/src/footnotes.c
 - ext/apex_ext/apex_src/vendor/cmark-gfm/src/footnotes.h